1
0

Merge branch 'master' into reledmac_endnote

This commit is contained in:
Maïeul Rouquette 2016-01-27 10:03:53 +01:00
commit bfabdf1948
52 changed files with 392 additions and 77 deletions

@ -24,3 +24,9 @@ proguard/
# Log Files
*.log
# Android Studio Navigation editor temp files
.navigation/
# Android Studio captures folder
captures/

@ -5,9 +5,13 @@ Makefile.in
# http://www.gnu.org/software/autoconf
/autom4te.cache
/autoscan.log
/autoscan-*.log
/aclocal.m4
/compile
/config.h.in
/configure
/configure.scan
/depcomp
/install-sh
/missing

@ -1,5 +1,5 @@
composer.phar
vendor/
/vendor/
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file

20
D.gitignore Normal file

@ -0,0 +1,20 @@
# Compiled Object files
*.o
*.obj
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Compiled Static libraries
*.a
*.lib
# Executables
*.exe
# DUB
.dub
docs.json
__dummy.html

@ -1,14 +1,27 @@
# Dont commit the following directories created by pub.
# See https://www.dartlang.org/tools/private-files.html
# Files and directories created by pub
.buildlog
.packages
.project
.pub/
build/
packages
**/packages/
# Or the files created by dart2js.
# Files created by dart2js
# (Most Dart developers will use pub build to compile Dart, use/modify these
# rules if you intend to use dart2js directly
# Convention is to use extension '.dart.js' for Dart compiled to Javascript to
# differentiate from explicit Javascript files)
*.dart.js
*.js_
*.part.js
*.js.deps
*.js.map
*.info.json
# Include when developing application packages.
# Directory created by dartdoc
doc/api/
# Don't commit pubspec lock file
# (Library packages only! Remove pattern if developing an application package)
pubspec.lock

@ -20,6 +20,10 @@
# Deployment Manager configuration file for your project. Added in Delphi XE2.
# Uncomment this if it is not mobile development and you do not use remote debug feature.
#*.deployproj
#
# C++ object files produced when C/C++ Output file generation is configured.
# Uncomment this if you are not using external objects (zlib library for example).
#*.obj
#
# Delphi compiler-generated binaries (safe to delete)
@ -37,9 +41,13 @@
*.tds
*.dcu
*.lib
*.a
*.o
*.ocx
# Delphi autogenerated files (duplicated info)
*.cfg
*.hpp
*Resource.rc
# Delphi local files (user-specific info)
@ -53,5 +61,5 @@
__history/
*.~*
# Castalia statistics file
# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
*.stat

@ -15,7 +15,7 @@ robots.txt
/MAINTAINERS.txt
/UPGRADE.txt
/README.txt
sites/all/README.txt
sites/README.txt
sites/all/modules/README.txt
sites/all/themes/README.txt

@ -11,6 +11,10 @@
# comment the following line if you want to have your project file included.
eagle.epf
# Autorouter files
*.pro
*.job
# CAM files
*.$$$
*.cmp

@ -1,4 +1,5 @@
/_build
/cover
/deps
erl_crash.dump
*.ez

5
Elm.gitignore Normal file

@ -0,0 +1,5 @@
# elm-package generated files
elm-package.json
elm-stuff/
# elm-repl generated files
repl-temp-*

@ -1,6 +1,5 @@
*.pydevproject
.metadata
.gradle
bin/
tmp/
*.tmp
@ -20,7 +19,10 @@ local.properties
# Locally stored "Eclipse launch configurations"
*.launch
# CDT-specific
# PyDev specific (Python IDE for Eclipse)
*.pydevproject
# CDT-specific (C/C++ Development Tooling)
.cproject
# JDT-specific (Eclipse Java Development Tools)
@ -29,11 +31,17 @@ local.properties
# Java annotation processor (APT)
.factorypath
# PDT-specific
# PDT-specific (PHP Development Tools)
.buildpath
# sbteclipse plugin
.target
# Tern plugin
.tern-project
# TeXlipse plugin
.texlipse
# STS (Spring Tool Suite)
.springBeans

@ -1,2 +1,2 @@
# The compilation directoy
# The compilation directory
EIFGENs

@ -30,3 +30,6 @@ tramp
# cask packages
.cask/
# server auth directory
/server/

2
Global/GPG.gitignore Normal file

@ -0,0 +1,2 @@
secring.*

@ -1,32 +1,26 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
*.iml
## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries
.idea/workspace.xml
.idea/tasks.xml
.idea/dictionaries
# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml
.idea/dataSources.ids
.idea/dataSources.xml
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
# Gradle:
# .idea/gradle.xml
# .idea/libraries
.idea/gradle.xml
.idea/libraries
# Mongo Explorer plugin:
# .idea/mongoSettings.xml
.idea/mongoSettings.xml
## File-based project format:
*.ipr
*.iws
## Plugin-specific files:
@ -44,3 +38,4 @@ atlassian-ide-plugin.xml
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

@ -1,5 +1,8 @@
*~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences
.directory

@ -1,3 +1,6 @@
/.hg/*
*/.hg/*
.hg/
.hgignore
.hgsigs
.hgsub
.hgsubstate
.hgtags

@ -8,3 +8,6 @@
# Excel Backup File
*.xlk
# PowerPoint temporary
~$*.ppt*

@ -4,5 +4,4 @@ nbbuild/
dist/
nbdist/
nbactions.xml
nb-configuration.xml
.nb-gradle/

1
Global/Otto.gitignore Normal file

@ -0,0 +1 @@
.otto/

@ -1,7 +1,9 @@
# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
TAGS
.TAGS
!TAGS/
tags
.tags
!tags/
gtags.files
GTAGS

@ -1,6 +1,10 @@
# swap
[._]*.s[a-w][a-z]
[._]s[a-w][a-z]
# persistent undo
*.un~
# session
Session.vim
# temporary
.netrwhist
*~

@ -4,6 +4,9 @@
[Bb]in
[Ii]nclude
[Ll]ib
[Ll]ib64
[Ll]ocal
[Ss]cripts
pyvenv.cfg
.venv
pip-selfcheck.json

@ -1,2 +1,2 @@
.settings
.vscode

@ -4,7 +4,7 @@
## Build generated
build/
DerivedData
DerivedData/
## Various settings
*.pbxuser
@ -15,9 +15,9 @@ DerivedData
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
xcuserdata/
## Other
*.xccheckout
*.moved-aside
*.xcuserstate
*.xccheckout
*.xcscmblueprint

@ -42,6 +42,16 @@
*_usage.xml
*_xst.xrpt
# iMPACT generated files
_impactbatch.log
impact.xsl
impact_impact.xwbt
ise_impact.cmd
webtalk_impact.xml
# Core Generator generated files
xaw2verilog.log
# project-wide generated files
*.gise
par_usage_statistics.html

@ -6,3 +6,6 @@ gradle-app.setting
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar
# Cache of project
.gradletasknamecache

@ -296,6 +296,7 @@
/components/com_wrapper/*
/components/index.html
/images/banners/*
/images/headers/*
/images/sampledata/*
/images/joomla*
/images/index.html
@ -309,6 +310,7 @@
/language/en-GB/en-GB.com_tags.ini
/language/en-GB/en-GB.finder_cli.ini
/language/en-GB/en-GB.lib_fof.sys.ini
/language/en-GB/en-GB.lib_fof.ini
/language/en-GB/en-GB.com_content.ini
/language/en-GB/en-GB.lib_idna_convert.sys.ini
/language/en-GB/en-GB.com_mailto.ini
@ -395,21 +397,36 @@
/language/en-GB/install.xml
/language/overrides/*
/language/index.html
/layouts/joomla/*
/layouts/libraries/*
/layouts/plugins/*
/layouts/index.html
/libraries/cms.php
/libraries/cms/*
/libraries/fof/*
/libraries/idna_convert/*
/libraries/joomla/*
/libraries/legacy/*
/libraries/phpass/*
/libraries/phpmailer/*
/libraries/phputf8/*
/libraries/simplepie/*
/libraries/vendor/*
/libraries/classmap.php
/libraries/import.legacy.php
/libraries/index.html
/libraries/import.php
/libraries/loader.php
/libraries/platform.php
/logs/*
/media/cms/*
/media/com_contenthistory/*
/media/com_finder/*
/media/com_joomlaupdate/*
/media/com_wrapper/*
/media/contacts/*
/media/editors/*
/media/jui/*
/media/mailto/*
/media/media/*
/media/mod_languages/*
@ -439,6 +456,8 @@
/modules/mod_search/*
/modules/mod_stats/*
/modules/mod_syndicate/*
/modules/mod_tags_popular/*
/modules/mod_tags_similar/*
/modules/mod_users_latest/*
/modules/mod_weblinks/*
/modules/mod_whosonline/*
@ -448,6 +467,7 @@
/plugins/authentication/gmail/*
/plugins/authentication/joomla/*
/plugins/authentication/ldap/*
/plugins/authentication/cookie/*
/plugins/authentication/index.html
/plugins/captcha/recaptcha/*
/plugins/captcha/index.html
@ -523,3 +543,4 @@
/index.php
/joomla.xml
/*.txt
/robots.txt.dist

@ -3,6 +3,8 @@
# Temporary files
*.000
*.bak
*.bck
*.kicad_pcb-bak
# Netlist files (exported from Eeschema)
*.net

@ -1,4 +1,4 @@
Copyright (c) 2014 GitHub, Inc.
Copyright (c) 2016 GitHub, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),

@ -1,4 +1,14 @@
/bootstrap/compiled.php
vendor/
node_modules/
# Laravel 4 specific
bootstrap/compiled.php
app/storage/
# Laravel 5 & Lumen specific
bootstrap/cache/
storage/
.env.*.php
.env.php
.env
.env.example

@ -1,6 +1,7 @@
# Logs
logs
*.log
npm-debug.log*
# Runtime data
pids
@ -23,5 +24,10 @@ coverage
build/Release
# Dependency directory
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
node_modules
# Optional npm cache directory
.npm
# Optional REPL history
.node_repl_history

@ -4,7 +4,7 @@
## Build generated
build/
DerivedData
DerivedData/
## Various settings
*.pbxuser
@ -15,12 +15,11 @@ DerivedData
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
xcuserdata/
## Other
*.xccheckout
*.moved-aside
*.xcuserstate
*.xccheckout
*.xcscmblueprint
## Obj-C/Swift specific
@ -31,9 +30,9 @@ xcuserdata
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
#Pods/
# Pods/
# Carthage
#
@ -41,3 +40,13 @@ xcuserdata
# Carthage/Checkouts
Carthage/Build
# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
fastlane/report.xml
fastlane/screenshots

@ -9,3 +9,5 @@ image/data/
image/cache/
system/cache/
system/logs/
system/storage/

@ -5,13 +5,11 @@ bin/
/lib/
/logs/
/modules
/project/project
/project/target
/target
tmp/
test-result
server.pid
*.iml
*.eml
/dist/
.cache

@ -7,9 +7,9 @@ config/settings.*.php
# The following files are generated by PrestaShop.
admin-dev/autoupgrade/
cache/
/cache/*
config/xml/*.xml
log/
/log/*
*sitemap.xml
themes/*/cache/
modules/*/config*.xml
@ -21,5 +21,5 @@ admin-dev/backups/
admin-dev/export/
admin-dev/import/
download/
img/
/img/*
upload/

@ -43,6 +43,7 @@ htmlcov/
nosetests.xml
coverage.xml
*,cover
.hypothesis/
# Translations
*.mo
@ -50,9 +51,13 @@ coverage.xml
# Django stuff:
*.log
local_settings.py
# Sphinx documentation
docs/_build/
# PyBuilder
target/
#Ipython Notebook
.ipynb_checkpoints

@ -23,7 +23,7 @@ moc_*.cpp
qrc_*.cpp
ui_*.h
Makefile*
*-build-*
*build-*
# QtCreator
@ -32,3 +32,7 @@ Makefile*
#QtCtreator Qml
*.qmlproject.user
*.qmlproject.user.*
#QtCtreator CMake
CMakeLists.txt.user

@ -2,6 +2,9 @@
.Rhistory
.Rapp.history
# Session Data files
.RData
# Example code in package build process
*-Ex.R

@ -31,17 +31,17 @@ high quality, we request that contributions adhere to the following guidelines.
- **Provide a link to the application or projects homepage**. Unless its
extremely popular, theres a chance the maintainers dont know about or use
the language, framework, editor, app, or project your change applies to.
- **Provide links to documentation** supporting the change youre making.
Current, canonical documentation mentioning the files being ignored is best.
If documentation isnt available to support your change, do the best you can
to explain what the files being ignored are for.
- **Explain why youre making a change**. Even if it seems self-evident, please
take a sentence or two to tell us why your change or addition should happen.
Its especially helpful to articulate why this change applies to *everyone*
who works with the applicable technology, rather than just you or your team.
- **Please consider the scope of your change**. If your change specific to a
certain language or framework, then make sure the change is made to the
template for that language or framework, rather than to the template for an
@ -70,9 +70,9 @@ Heres how we suggest you go about proposing a change to this project:
Using the web-based interface to make changes is fine too, and will help you
by automatically forking the project and prompting to send a pull request too.
[fork]: http://help.github.com/forking/
[fork]: https://help.github.com/articles/fork-a-repo/
[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
[pr]: http://help.github.com/pull-requests/
[pr]: https://help.github.com/articles/using-pull-requests/
## License

@ -16,11 +16,11 @@ pickle-email-*.html
config/initializers/secret_token.rb
config/secrets.yml
## Environment normalisation:
## Environment normalization:
/.bundle
/vendor/bundle
# these should all be checked in to normalise the environment:
# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
@ -33,3 +33,6 @@ bower.json
# Ignore pow environment settings
.powenv
# Ignore Byebug command history file.
.byebug_history

@ -21,7 +21,7 @@ build/
/doc/
/rdoc/
## Environment normalisation:
## Environment normalization:
/.bundle/
/vendor/bundle
/lib/bundler/man/

@ -9,3 +9,7 @@
# Generated by Cargo
/target/
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
Cargo.lock

@ -4,7 +4,7 @@
## Build generated
build/
DerivedData
DerivedData/
## Various settings
*.pbxuser
@ -15,23 +15,32 @@ DerivedData
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
xcuserdata/
## Other
*.xccheckout
*.moved-aside
*.xcuserstate
*.xccheckout
*.xcscmblueprint
## Obj-C/Swift specific
*.hmap
*.ipa
## Playgrounds
timeline.xctimeline
playground.xcworkspace
# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/
# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/
@ -41,3 +50,13 @@ xcuserdata
# Carthage/Checkouts
Carthage/Build
# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
fastlane/report.xml
fastlane/screenshots

@ -26,6 +26,9 @@
/web/bundles/
/web/uploads/
# Assets managed by Bower
/web/assets/vendor/
# PHPUnit
/app/phpunit.xml
/phpunit.xml

@ -6,6 +6,7 @@
*.fls
*.out
*.toc
*.fmt
## Intermediate documents:
*.dvi
@ -32,8 +33,6 @@
*.pdfsync
## Auxiliary and intermediate files from other packages:
# algorithms
*.alg
*.loa
@ -49,7 +48,11 @@ acs-*.bib
*.snm
*.vrb
# cprotect
*.cpt
#(r)(e)ledmac/(r)(e)ledpar
*.end
*.?end
*.[1-9]
*.[1-9][0-9]
@ -93,6 +96,8 @@ acs-*.bib
# minitoc
*.maf
*.mlf
*.mlt
*.mtc
*.mtc[0-9]
*.mtc[1-9][0-9]
@ -120,6 +125,17 @@ _minted*
*.sympy
sympy-plots-for-*.tex/
# pdfcomment
*.upa
*.upb
#pythontex
*.pytxcode
pythontex-files-*/
# Texpad
.texpadtmp
# TikZ & PGF
*.dpth
*.md5
@ -131,6 +147,16 @@ sympy-plots-for-*.tex/
# xindy
*.xdy
# xypic precompiled matrices
*.xyc
# WinEdt
*.bak
*.sav
# endfloat
*.ttt
*.fff
# Latexian
TSWLatexianTemp*

@ -1,5 +1,5 @@
## TYPO3 v6.2
# Ignore serveral upload and file directories.
# Ignore several upload and file directories.
/fileadmin/user_upload/
/fileadmin/_temp_/
/fileadmin/_processed_/

@ -1,12 +1,11 @@
# Note: VisualStudio gitignore rules may also be relevant
# Umbraco
# Ignore unimportant folders generated by Umbraco
**/App_Data/ClientDependency/
**/App_Data/ExamineIndexes/
**/App_Data/Logs/
**/App_Data/[Pp]review/
**/App_Data/TEMP/
Cached/
**/App_Data/NuGetBackup/
# Ignore Umbraco content cache file
**/App_Data/umbraco.config
@ -15,3 +14,6 @@ Cached/
# Make sure to include details from VisualStudio.gitignore BEFORE this
!**/App_Data/[Pp]ackages/
!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
# ImageProcessor DiskCache
**/App_Data/cache/

@ -2,8 +2,11 @@
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
# Autogenerated VS/MD solution and project files
ExportedObj/
*.csproj
*.unityproj
*.sln
@ -13,9 +16,15 @@
*.userprefs
*.pidb
*.booproj
*.svd
# Unity3D generated meta files
*.pidb.meta
# Unity3D Generated File On Crash Reports
sysinfo.txt
# Builds
*.apk
*.unitypackage

59
UnrealEngine.gitignore Normal file

@ -0,0 +1,59 @@
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
*.ipa
# These project files can be generated by the engine
*.xcodeproj
*.sln
*.suo
*.opensdf
*.sdf
*.VC.opendb
# Precompiled Assets
SourceArt/**/*.png
SourceArt/**/*.tga
# Binary Files
Binaries/*
# Builds
Build/*
# Don't ignore icon files in Build
!Build/**/*.ico
# Configuration files generated by the Editor
Saved/*
# Compiled source files for the engine to use
Intermediate/*
# Cache files for the editor to use
DerivedDataCache/*

@ -17,10 +17,10 @@
[Rr]eleases/
x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
# Visual Studio 2015 cache/options directory
.vs/
@ -76,6 +76,7 @@ _Chutzpah*
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
@ -84,6 +85,7 @@ ipch/
*.psess
*.vsp
*.vspx
*.sap
# TFS 2012 Local Workspace
$tf/
@ -149,13 +151,24 @@ publish/
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets
# Windows Azure Build Output
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Microsoft Azure ApplicationInsights config file
ApplicationInsights.config
# Windows Store app package directory
AppPackages/
BundleArtifacts/
# Visual Studio cache files
# files ending in .cache can be ignored
@ -165,7 +178,6 @@ AppPackages/
# Others
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
@ -198,6 +210,9 @@ UpgradeLog*.htm
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
@ -206,3 +221,17 @@ FakesAssemblies/
# Visual Studio 6 workspace options file
*.opt
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
# FAKE - F# Make
.fake/

@ -1,3 +1,4 @@
# for projects that use Waf for building: http://code.google.com/p/waf/
.waf-*
.waf3-*
.lock-*